projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 315230b 2c82f2a)
bitkeeper revision 1.1236.1.131 (4244e3f9gcG_CR3IOZykct93jfo08w)
authorxen-ia64.adm@bkbits.net <xen-ia64.adm@bkbits.net>
Fri, 25 Mar 2005 22:20:40 +0000 (22:20 +0000)
committerxen-ia64.adm@bkbits.net <xen-ia64.adm@bkbits.net>
Fri, 25 Mar 2005 22:20:40 +0000 (22:20 +0000)
Merge bk://xen.bkbits.net/xeno-unstable.bk
into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/arch/ia64/patch/linux-2.6.7/time.c patch | diff1 | diff2 | blob | history
xen/drivers/char/console.c patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/drivers/char/console.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.